diff --git a/materials/x22/lab/1/lab00/lab00.ipynb b/materials/x22/lab/1/lab00/lab00.ipynb
index 27b7df1..4108e90 100644
--- a/materials/x22/lab/1/lab00/lab00.ipynb
+++ b/materials/x22/lab/1/lab00/lab00.ipynb
@@ -586,9 +586,11 @@
    "OK_FORMAT": true,
    "tests": {}
   },
-  "course": "8x",
-  "section": "1",
-  "assignment": "lab00"
+  "otter_service": {
+    "course": "8x",
+    "section": "1",
+    "assignment": "lab00"
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 5
diff --git a/materials/x22/lab/1/lab01/lab01.ipynb b/materials/x22/lab/1/lab01/lab01.ipynb
index 121d7f7..c0d0e7d 100644
--- a/materials/x22/lab/1/lab01/lab01.ipynb
+++ b/materials/x22/lab/1/lab01/lab01.ipynb
@@ -848,13 +848,16 @@
   }
  ],
  "metadata": {
-  "course": "8x",
+  "otter_service": {
+    "course": "8x",
+    "section": "1",
+    "assignment": "lab01"
+  },
   "kernelspec": {
    "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
-  "assignment": "lab01",
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
@@ -1045,8 +1048,7 @@
      ]
     }
    }
-  },
-  "section": "1"
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 5
diff --git a/materials/x22/lab/1/lab02/lab02.ipynb b/materials/x22/lab/1/lab02/lab02.ipynb
index 2766723..3f71576 100644
--- a/materials/x22/lab/1/lab02/lab02.ipynb
+++ b/materials/x22/lab/1/lab02/lab02.ipynb
@@ -886,13 +886,16 @@
   }
  ],
  "metadata": {
-  "course": "8x",
+  "otter_service": {
+    "course": "8x",
+    "section": "1",
+    "assignment": "lab02"
+  },
   "kernelspec": {
    "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
-  "assignment": "lab02",
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
@@ -1134,8 +1137,7 @@
      ]
     }
    }
-  },
-  "section": "1"
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 5
diff --git a/materials/x22/lab/1/lab03/lab03.ipynb b/materials/x22/lab/1/lab03/lab03.ipynb
index 8a9efef..63ec6e3 100644
--- a/materials/x22/lab/1/lab03/lab03.ipynb
+++ b/materials/x22/lab/1/lab03/lab03.ipynb
@@ -1430,6 +1430,11 @@
   }
  ],
  "metadata": {
+  "otter_service": {
+    "course": "8x",
+    "section": "1",
+    "assignment": "lab03"
+  },
   "kernelspec": {
    "display_name": "Python 3",
    "language": "python",
@@ -1902,10 +1907,7 @@
      ]
     }
    }
-  },
-  "course": "8x",
-  "section": "1",
-  "assignment": "lab03"
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 5
diff --git a/materials/x22/lab/1/lab04/lab04.ipynb b/materials/x22/lab/1/lab04/lab04.ipynb
index b88cc38..38c5cb9 100644
--- a/materials/x22/lab/1/lab04/lab04.ipynb
+++ b/materials/x22/lab/1/lab04/lab04.ipynb
@@ -1204,13 +1204,16 @@
   }
  ],
  "metadata": {
-  "course": "8x",
+  "otter_service": {
+    "course": "8x",
+    "section": "1",
+    "assignment": "lab04"
+  },
   "kernelspec": {
    "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
-  "assignment": "lab04",
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
@@ -1582,8 +1585,7 @@
      ]
     }
    }
-  },
-  "section": "1"
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 5
diff --git a/materials/x22/lab/1/lab05/lab05.ipynb b/materials/x22/lab/1/lab05/lab05.ipynb
index a3e58b0..994aab2 100644
--- a/materials/x22/lab/1/lab05/lab05.ipynb
+++ b/materials/x22/lab/1/lab05/lab05.ipynb
@@ -921,6 +921,11 @@
   }
  ],
  "metadata": {
+  "otter_service": {
+    "course": "8x",
+    "section": "1",
+    "assignment": "lab05"
+  },
   "kernelspec": {
    "display_name": "Python 3",
    "language": "python",
@@ -1317,10 +1322,7 @@
      ]
     }
    }
-  },
-  "course": "8x",
-  "section": "1",
-  "assignment": "lab05"
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 5
diff --git a/materials/x22/lab/1/lab06/lab06.ipynb b/materials/x22/lab/1/lab06/lab06.ipynb
index baef58e..fee19c8 100644
--- a/materials/x22/lab/1/lab06/lab06.ipynb
+++ b/materials/x22/lab/1/lab06/lab06.ipynb
@@ -509,13 +509,16 @@
   }
  ],
  "metadata": {
-  "course": "8x",
+  "otter_service": {
+    "course": "8x",
+    "section": "1",
+    "assignment": "lab06"
+  },
   "kernelspec": {
    "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
-  "assignment": "lab06",
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
@@ -687,8 +690,7 @@
      ]
     }
    }
-  },
-  "section": "1"
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 5
diff --git a/materials/x22/lab/2/lab01/lab01.ipynb b/materials/x22/lab/2/lab01/lab01.ipynb
index 6a68106..c2e611b 100644
--- a/materials/x22/lab/2/lab01/lab01.ipynb
+++ b/materials/x22/lab/2/lab01/lab01.ipynb
@@ -606,6 +606,11 @@
   }
  ],
  "metadata": {
+  "otter_service": {
+    "course": "8x",
+    "section": "2",
+    "assignment": "lab01"
+  },
   "kernelspec": {
    "display_name": "Python 3",
    "language": "python",
@@ -780,10 +785,7 @@
      ]
     }
    }
-  },
-  "course": "8x",
-  "section": "2",
-  "assignment": "lab01"
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 5
diff --git a/materials/x22/lab/2/lab02/lab02.ipynb b/materials/x22/lab/2/lab02/lab02.ipynb
index da3d582..ec12fb5 100644
--- a/materials/x22/lab/2/lab02/lab02.ipynb
+++ b/materials/x22/lab/2/lab02/lab02.ipynb
@@ -403,13 +403,16 @@
   }
  ],
  "metadata": {
-  "course": "8x",
+  "otter_service": {
+    "course": "8x",
+    "section": "2",
+    "assignment": "lab02"
+  },
   "kernelspec": {
    "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
-  "assignment": "lab02",
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
@@ -469,8 +472,7 @@
      ]
     }
    }
-  },
-  "section": "2"
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 5
diff --git a/materials/x22/lab/2/lab03/lab03.ipynb b/materials/x22/lab/2/lab03/lab03.ipynb
index 0d4b9f1..3cf810c 100644
--- a/materials/x22/lab/2/lab03/lab03.ipynb
+++ b/materials/x22/lab/2/lab03/lab03.ipynb
@@ -569,13 +569,16 @@
   }
  ],
  "metadata": {
-  "course": "8x",
+  "otter_service": {
+    "course": "8x",
+    "section": "2",
+    "assignment": "lab03"
+  },
   "kernelspec": {
    "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
-  "assignment": "lab03",
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
@@ -804,8 +807,7 @@
      ]
     }
    }
-  },
-  "section": "2"
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 5
diff --git a/materials/x22/lab/2/lab04/lab04.ipynb b/materials/x22/lab/2/lab04/lab04.ipynb
index eb4b2fb..74da60a 100644
--- a/materials/x22/lab/2/lab04/lab04.ipynb
+++ b/materials/x22/lab/2/lab04/lab04.ipynb
@@ -565,6 +565,12 @@
   }
  ],
  "metadata": {
+   "otter_service": {
+      "course": "8x",
+      "section": "2",
+      "assignment": "lab04"
+   },
+    
   "kernelspec": {
    "display_name": "Python 3",
    "language": "python",
@@ -788,10 +794,7 @@
      ]
     }
    }
-  },
-  "course": "8x",
-  "section": "2",
-  "assignment": "lab04"
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 5
diff --git a/materials/x22/lab/2/lab05/lab05.ipynb b/materials/x22/lab/2/lab05/lab05.ipynb
index deb0328..23b4b0c 100644
--- a/materials/x22/lab/2/lab05/lab05.ipynb
+++ b/materials/x22/lab/2/lab05/lab05.ipynb
@@ -831,13 +831,16 @@
   }
  ],
  "metadata": {
-  "course": "8x",
+  "otter_service": {
+    "course": "8x",
+    "section": "2",
+    "assignment": "lab05"
+  },
   "kernelspec": {
    "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
-  "assignment": "lab05",
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
@@ -1121,8 +1124,7 @@
      ]
     }
    }
-  },
-  "section": "2"
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 5
diff --git a/materials/x22/lab/2/lab06/lab06.ipynb b/materials/x22/lab/2/lab06/lab06.ipynb
index 6504dee..ff2e52b 100644
--- a/materials/x22/lab/2/lab06/lab06.ipynb
+++ b/materials/x22/lab/2/lab06/lab06.ipynb
@@ -558,6 +558,11 @@
   }
  ],
  "metadata": {
+  "otter_service": {
+    "course": "8x",
+    "section": "2",
+    "assignment": "lab06"
+  },    
   "kernelspec": {
    "display_name": "Python 3",
    "language": "python",
@@ -768,10 +773,7 @@
      ]
     }
    }
-  },
-  "course": "8x",
-  "section": "2",
-  "assignment": "lab06"
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 5
diff --git a/materials/x22/lab/2/lab07/lab07.ipynb b/materials/x22/lab/2/lab07/lab07.ipynb
index 4da5c8e..b03cd8a 100644
--- a/materials/x22/lab/2/lab07/lab07.ipynb
+++ b/materials/x22/lab/2/lab07/lab07.ipynb
@@ -731,6 +731,11 @@
   }
  ],
  "metadata": {
+  "otter_service": {
+    "course": "8x",
+    "section": "2",
+    "assignment": "lab07"
+  },    
   "kernelspec": {
    "display_name": "Python 3",
    "language": "python",
@@ -914,10 +919,7 @@
      ]
     }
    }
-  },
-  "course": "8x",
-  "section": "2",
-  "assignment": "lab07"
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 5
diff --git a/materials/x22/lab/3/lab01/lab01.ipynb b/materials/x22/lab/3/lab01/lab01.ipynb
index 5b2d151..326b7f4 100644
--- a/materials/x22/lab/3/lab01/lab01.ipynb
+++ b/materials/x22/lab/3/lab01/lab01.ipynb
@@ -984,13 +984,16 @@
   }
  ],
  "metadata": {
-  "course": "8x",
+  "otter_service": {
+    "course": "8x",
+    "section": "3",
+    "assignment": "lab01"
+  },  
   "kernelspec": {
    "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
-  "assignment": "lab01",
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
@@ -1324,8 +1327,7 @@
      ]
     }
    }
-  },
-  "section": "3"
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 5
diff --git a/materials/x22/lab/3/lab02/lab02.ipynb b/materials/x22/lab/3/lab02/lab02.ipynb
index e535f8a..9f952c4 100644
--- a/materials/x22/lab/3/lab02/lab02.ipynb
+++ b/materials/x22/lab/3/lab02/lab02.ipynb
@@ -992,6 +992,11 @@
   }
  ],
  "metadata": {
+  "otter_service": {
+    "course": "8x",
+    "section": "3",
+    "assignment": "lab02"
+  }, 
   "kernelspec": {
    "display_name": "Python 3",
    "language": "python",
diff --git a/materials/x22/lab/3/lab03/lab03.ipynb b/materials/x22/lab/3/lab03/lab03.ipynb
index e0b6832..c3f0940 100644
--- a/materials/x22/lab/3/lab03/lab03.ipynb
+++ b/materials/x22/lab/3/lab03/lab03.ipynb
@@ -938,6 +938,11 @@
   }
  ],
  "metadata": {
+  "otter_service": {
+    "course": "8x",
+    "section": "3",
+    "assignment": "lab03"
+  }, 
   "kernelspec": {
    "display_name": "Python 3",
    "language": "python",
@@ -1257,10 +1262,7 @@
      ]
     }
    }
-  },
-  "course": "8x",
-  "section": "3",
-  "assignment": "lab03"
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 5
diff --git a/materials/x22/lab/3/lab04/lab04.ipynb b/materials/x22/lab/3/lab04/lab04.ipynb
index 672731a..1e6fd74 100644
--- a/materials/x22/lab/3/lab04/lab04.ipynb
+++ b/materials/x22/lab/3/lab04/lab04.ipynb
@@ -1004,6 +1004,11 @@
   }
  ],
  "metadata": {
+  "otter_service": {
+    "course": "8x",
+    "section": "3",
+    "assignment": "lab04"
+  }, 
   "kernelspec": {
    "display_name": "Python 3",
    "language": "python",
@@ -1430,10 +1435,7 @@
      ]
     }
    }
-  },
-  "course": "8x",
-  "section": "3",
-  "assignment": "lab04"
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 5