diff --git a/farmbot.tji b/farmbot.tji
new file mode 100644
index 0000000000000000000000000000000000000000..c2011056aba738c9e4857bba45e10117791b7e4e
--- /dev/null
+++ b/farmbot.tji
@@ -0,0 +1,66 @@
+/* Moving back to M planning */
+
+task farmbot "FarmBot" {
+  task epoch "start" {
+    start 2023-01-30
+  }
+  // #A
+  task design "Bed and UI design from Vattenhallen" {
+    start 2023-02-01
+  }
+  // #B
+  task move "Move to vattenhallen" {
+    start 2023-02-27
+    end 2023-03-10
+    depends !disassembly
+  }
+  // #C
+  task final_handover "Final handover" {
+//    start 2023-03-10
+//    end 2023-03-17
+    duration 1w
+    depends !mount_electronics
+    depends !prepare_handover
+    depends !prepare_ui
+  }
+  // #1
+  task disassembly "Disassemble" {
+    depends !pixels
+    effort 1 d
+    allocate alexanderp
+    priority 600
+  }
+  // #2
+  task prepare_electronics "Prepare connector panel, computer and cabling" {
+    depends !design
+    effort 1 w
+    allocate alexanderp
+    priority 600
+  }
+  // #3
+  task mount_electronics "Mount connector panel, computer and cabling" {
+    depends !move
+    depends !prepare_electronics
+    effort 1 w
+    allocate alexanderp
+    priority 600
+  }
+  // #4
+  task prepare_handover "Prepare handover (usage+installation)" {
+    depends !epoch
+    effort 2 d
+    allocate anton
+  }
+  // #5
+  task pixels "Troubleshoot pixel coordinates" {
+    depends !epoch
+    effort 2 d
+    allocate anton
+  }
+  // #6
+  task prepare_ui "Prepare UI"  {
+    depends !design
+    effort 2 d
+    allocate anton
+  }
+}
\ No newline at end of file
diff --git a/resources.tji b/resources.tji
index 460b4c0d0abfe4c3d54c5d5053b029e94814bec4..0341990c56b4a59e448d0b85988486a507f50a91 100644
--- a/resources.tji
+++ b/resources.tji
@@ -11,6 +11,8 @@ resource andersb "Anders Blomdell" {
 resource andersn "Anders Nilsson" {
   vacation 2020-03-05 - 2020-03-23
 }
+resource anton "Anton Tetov Johansson" {
+}
 resource bjorno "Björn Olofsson" {
 }
 resource johanl "Johan Lauri" {
diff --git a/robot_lab.tji b/robot_lab.tji
index 5e6540643fa6cacdef78a614ab0a917f96cc67df..cf6c7bd3ab17e54bac67caeb015d0e66ce6e0a1c 100644
--- a/robot_lab.tji
+++ b/robot_lab.tji
@@ -93,8 +93,7 @@ task robot_L3 "L3" {
   }
   task safety_controller "Install safety controller" {
     depends !reassembly_test
-    effort 2 w
-    allocate alexanderp
+    duration 2 w
   }
 }
 
@@ -103,7 +102,7 @@ task safety_m "Safety System (M)" {
 
   task design "Design (M)" {
     effort 3 w
-    allocate andersb, alexanderp, marcusk
+    allocate andersb, marcusk
   }
 
   task procurement "Procurement (M)" {
@@ -114,13 +113,13 @@ task safety_m "Safety System (M)" {
   task test "Test (M)" {
     depends !procurement
     effort 2 w
-    allocate andersb, alexanderp, marcusk
+    allocate andersb, marcusk
   }
 
   task assembly "Assembly (M)" {
     depends !test
     effort 1 m
-    allocate andersn, alexanderp, andersb
+    allocate andersn, andersb
   }
 }
 
@@ -128,7 +127,7 @@ task fencing "Robotlab fences" {
   task design "Design" {
     start 2023-01-30
     effort 2w
-    allocate andersb,alexanderp,bjorno
+    allocate andersb,bjorno
   }
   task procurement "Procurement" {
     depends !design
@@ -166,4 +165,5 @@ task organize_shelves "Organize stuff on shelves" {
   start 2023-01-19
   effort 4w
   allocate alexanderp
+  priority 400
 }
diff --git a/to-M.tjp b/to-M.tjp
index 7c4dd8aa2464f10282835fac06f5d33eeb93cf61..3a982baea1a0d3505d14cfda0a8e75116dee6fac 100644
--- a/to-M.tjp
+++ b/to-M.tjp
@@ -21,12 +21,14 @@ include "common-macros.tji"
 # Top level container tasks
 task milestones "Milestones" {}
 task robot_lab "Robotics Lab" { }
+task farmbot "FarmBot" { }
 task teaching_lab "Teaching Lab" { }
 task servers "Servers & Software" { }
 task various "Various tasks" { }
 
 include "resources.tji"
 include "robot_lab.tji" { taskprefix robot_lab }
+include "farmbot.tji" { taskprefix farmbot }
 include "teaching_lab.tji" { taskprefix teaching_lab }
 include "servers.tji" { taskprefix servers }
 include "various-2023.tji" { taskprefix various }