diff --git a/.gitignore b/.gitignore
index ee70fbd0..53053b82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,6 @@ debugSymbols
 test/.test_coverage.dart
 lib/.env.dart
 gj_common
+
+# Monarch related
+.monarch/
diff --git a/pubspec.lock b/pubspec.lock
index 06bc8372..93aded56 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -92,6 +92,62 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
+  build:
+    dependency: transitive
+    description:
+      name: build
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
+  build_config:
+    dependency: transitive
+    description:
+      name: build_config
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.4.7"
+  build_daemon:
+    dependency: transitive
+    description:
+      name: build_daemon
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.10"
+  build_resolvers:
+    dependency: transitive
+    description:
+      name: build_resolvers
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
+  build_runner:
+    dependency: "direct dev"
+    description:
+      name: build_runner
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.12.2"
+  build_runner_core:
+    dependency: transitive
+    description:
+      name: build_runner_core
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "6.1.12"
+  built_collection:
+    dependency: transitive
+    description:
+      name: built_collection
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "5.0.0"
+  built_value:
+    dependency: transitive
+    description:
+      name: built_value
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "8.0.4"
   cached_network_image:
     dependency: "direct main"
     description:
@@ -113,6 +169,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.1"
   cli_util:
     dependency: transitive
     description:
@@ -127,6 +190,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
+  code_builder:
+    dependency: transitive
+    description:
+      name: code_builder
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.7.0"
   collection:
     dependency: "direct main"
     description:
@@ -206,6 +276,13 @@ packages:
       url: "https://github.com/GitJournal/dart-git.git"
     source: git
     version: "0.0.2"
+  dart_style:
+    dependency: transitive
+    description:
+      name: dart_style
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
   device_info:
     dependency: "direct main"
     description:
@@ -362,6 +439,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.2"
+  fixnum:
+    dependency: transitive
+    description:
+      name: fixnum
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -498,6 +582,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
+  graphs:
+    dependency: transitive
+    description:
+      name: graphs
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
   http:
     dependency: "direct main"
     description:
@@ -640,6 +731,27 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.0"
+  monarch:
+    dependency: "direct dev"
+    description:
+      name: monarch
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.3"
+  monarch_annotations:
+    dependency: transitive
+    description:
+      name: monarch_annotations
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.1"
+  monarch_utils:
+    dependency: transitive
+    description:
+      name: monarch_utils
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.2"
   multicast_dns:
     dependency: "direct dev"
     description:
@@ -871,6 +983,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
+  pubspec_parse:
+    dependency: transitive
+    description:
+      name: pubspec_parse
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
   quick_actions:
     dependency: "direct main"
     description:
@@ -1002,6 +1121,13 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.99"
+  source_gen:
+    dependency: transitive
+    description:
+      name: source_gen
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
   source_map_stack_trace:
     dependency: transitive
     description:
@@ -1051,6 +1177,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
+  stream_transform:
+    dependency: transitive
+    description:
+      name: stream_transform
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
   string_scanner:
     dependency: transitive
     description:
@@ -1107,6 +1240,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.2"
+  timing:
+    dependency: transitive
+    description:
+      name: timing
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
   tint:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index d85f8d80..8d8c498b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -92,6 +92,8 @@ dev_dependencies:
   multicast_dns: ^0.3.0
   #screenshots: ^2.1.1
   test: ^1.16.5
+  monarch: ^0.2.3
+  build_runner: ^1.10.3
 
 flutter:
   uses-material-design: true