diff --git a/public/assignments/week07.html b/public/assignments/week07.html
index fc3b8a904d239638f98730178ff01f0402319ae4..18ed52741316b588296a03b80bd709871b2dc0cc 100644
--- a/public/assignments/week07.html
+++ b/public/assignments/week07.html
@@ -33,18 +33,75 @@
                   <div class="content">
                     
                     <header class="main">
-                      <h2>7. Computer Controlled Machining</h2>
+                      <h2>7. Computer-Controlled Machining</h2>
                     </header>
 
                     <section>
-                      <p></p>
+                      <h3>Hero shot</h3>
+
+                      <span class="image object">
+                      <img src="../images/...jpg" alt="..." />
+                      </span>
                     </section>
 
                       <hr>
 
                     <section>
                       <h3>Group assignment</h3>
-                      <p></p>
+
+                      <p>It's time to get to know the CNC</p>
+
+                      <p>In order to do that, we created a simple square part using the machine's various cutting and engraving options:</p>
+
+                      <ul>
+                        <li>a round hole</li>
+                        <li>a rectangular pocket</li>
+                        <li>a notch with dogbones for nesting</li>
+                        <li>bridges to prevent the part from jumping off the table</li>
+                      </ul>
+
+                      <h4>Part design</h4>
+
+                      <p>We used Freecad to create and parameterized the entire the part using spreadsheets.</p>
+                      
+                      <p>The parameterized parts are :</p>
+
+                      <ul>
+
+                        <li>the side of the square</li> 
+                        <li>part thickness </li>
+                        <li>the radius of the fillets</li> 
+                        <li>round hole diameter</li>
+                        <li>X position of round hole</li>
+                        <li>round hole position Y</li>
+                        <li>kerf</li>
+                        <li>length of nesting</li> 
+                        <li>nesting width </li>
+                        <li>length of rectangular pocket</li> 
+                        <li>width of rectangular pocket </li>
+                        <li>rectangular pocket thickness </li>
+                        <li>the X position of the rectangular pocket</li> 
+                        <li>Y position of rectangular pocket</li>
+
+                      </ul>
+
+                      <h5>Easy part construction</h5>
+
+                      <p>To avoid drawing the different parts by manually entering each measurement, we've used the symmetry (horizontal, vertical) and constraint (horizontal, vertical, radius, diameter) options.</p>
+
+                      <p>The symmetry and constraint steps must be performed one by one to avoid errors.</p>
+
+                      <p>Once all the parts have been constrained, they are linked to the parametric table.</p> 
+
+                      <p>An error may occur from time to time. The solution is to remove redundant constraints displayed in the sidebar.</p> 
+
+                      <p>When the part design is ready, all lines and points are green and the message "fully constrained" appears in the sidebar.</p>
+
+                      <h5>Preparing the file</h5>
+
+                      <p>Once the object has been created, we need to prepare the file so that we can start working on the CNC.</p>
+
+                      <p>To do this, we must first register the various cutters and their parameters.</p>
 
                       <h4>Safety training</h4>
                       
diff --git a/public/images/cutting-in-progress.mp4 b/public/images/cutting-in-progress.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..3ff66e64361e5ff4f3c21b0c78a1e746fff6f409
Binary files /dev/null and b/public/images/cutting-in-progress.mp4 differ