diff --git a/docs/Weekly_Group_Assignments/week07.md b/docs/Weekly_Group_Assignments/week07.md
index 741e81a75bd5644b642aeb6337c71deaea87323c..425b5d87bc86e19eb05a4c2a75d780b9f38a12c1 100644
--- a/docs/Weekly_Group_Assignments/week07.md
+++ b/docs/Weekly_Group_Assignments/week07.md
@@ -1,61 +1,154 @@
# 7. Computer controlled machining
-This week I worked on defining my final project idea and started to getting used to the documentation process.
+# Group Assignment
-## Research
+## Instruction
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+group assignment
-> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+- do your lab's safety training
+- test runout, alignment, fixturing, speeds, feeds, materials, and toolpaths for your machine
-## Useful links
+individual assignment
-- [Jekyll](http://jekyll.org)
-- [Google](http://google.com)
-- [Markdown](https://en.wikipedia.org/wiki/Markdown)
+- [Here](https://fabacademy.org/2022/labs/kannai/students/yukiya-yamane/assignments/week08/)
-## Code Example
+## What I week this week
-Use the three backticks to separate code.
+- Learn how to use machine safely and test runout, alignment, fixturing, speeds, feeds, materials, and toolpaths for your machine → in this page
+- Ideate and design something big →[Individual Page](https://fabacademy.org/2022/labs/kannai/students/yukiya-yamane/assignments/week07/)
+- Milling by CNC machine →[Individual Page](https://fabacademy.org/2022/labs/kannai/students/yukiya-yamane/assignments/week07/)
+- Varnish and assemble →[Individual Page](https://fabacademy.org/2022/labs/kannai/students/yukiya-yamane/assignments/week07/)
-```
-// the setup function runs once when you press reset or power the board
-void setup() {
- // initialize digital pin LED_BUILTIN as an output.
- pinMode(LED_BUILTIN, OUTPUT);
-}
+## CNC Router and software I used
-// the loop function runs over and over again forever
-void loop() {
- digitalWrite(LED_BUILTIN, HIGH); // turn the LED on (HIGH is the voltage level)
- delay(1000); // wait for a second
- digitalWrite(LED_BUILTIN, LOW); // turn the LED off by making the voltage LOW
- delay(1000); // wait for a second
-}
-```
+- CNC router : [ZN1325](http://www.mesin-cnc.com/?product=mesin-cnc-router-model-1325)
+- Tool path maker : Vectric Cut2D Pro
+- G-code sender :Mach3
-## Gallery
+## Safety Instructions
-
+Safety was especially important for this week. Through the Wednesday class, I learned the risk and danger of CNC router. Tamiya-san gave me the lecture of how to use the CNC router.
-## Video
+ 
-### From Vimeo
+## **CNC workflow**
-<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
-<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
+### Setup CNC machine
-### From Youtube
+- Launch Cut2D and create new file
+- seting up about material parameter
-<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+ 
-## 3D Models
+- make toopath : set drilling position and cutting depth for fixing board
-<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
+ 
-<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;">
- <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita's Gown</a>
- by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a>
- on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a>
-</p>
-</div>
+- Save these data as .tap file
+- Launch Mach3 and load .tap file
+
+ 
+
+
+### CNC machine setting and milling
+
+- set the position of material (wooden plate) on the bed of CNC before fixing
+- set x-y-z origin at the corner of the material ( or any other appropriate position ), and set x0/y0/z0 in Mach3
+- fix the material on the bed by screwing
+
+ 
+
+
+CNC machine is ready.
+
+### Test
+
+On my computer
+
+- make 2D/3D CAD file : Fusion 360
+- the content of test will be described later
+
+ 
+
+- Export file as .ai /.dxf
+ - if choose .ai, save as “Illustrator CSâ€
+ - Check â€Create pdf compatible file†in save setting
+
+- load .ai file in Cut2D
+- setting the tool (mill) information and “tabs†to support the material. selecting outside or inside is important
+
+ 
+
+- edit Tool (depth, stepover, speed, feedrate)
+
+ 
+
+- press “calcurateâ€
+- set z-origin about 20 mm above the material surface, then, perform “air path†to check the tool path on CNC.
+- set z-origin on the material surface ( by using paper to check the contact between tool tip and the material)
+- wear the protective glassed and soundproof headphone
+- start milling ( be prepared to push the stop button, in case of emergency )
+- during the milling, check the wooden chips and the noise, then control the parameters such as feed rate, spindle speed, etc.
+- after the milling completed, clean the material surface
+
+ 
+
+- cut the “tabsâ€, pick up the parts.
+- remove the material and sacrifice plate, then clean the CNC and room.
+
+## Milling Test
+
+- scaling milled board and compare real scale with designed scale
+
+ 
+
+- check
+ - runout : turned out 6mm in the test which is equal to the thread diameter
+ - alignment : adjust positioning of end mill on the board and calibrate it
+ - fixturing : fixed board by screwing
+ - speeds : no problem to cut the material in 6500 rpm
+ - feeds : no problem to cut the material in 840 mm/min
+ - materials : plywood
+ - toolpaths : setting as mentioned above
+
+## Tab and Pocket Test
+
+- check whether pocket and dogbone can work or not
+- Prepare a sample of the pockets I will use in my design
+- load it to cut2D
+- select only the inside hole and set these parameters. be carefull for selecting “machine vector : insideâ€
+
+ 
+
+- export to .tap file and load it in Mach3
+- milling the board to make holes
+- After milling holes, choose only outside of the parts and set up parameters. In this time, select “Outside†in machine vectors
+
+ 
+
+- milling the board
+
+- milling completely
+
+ 
+
+- inspect the hole to be cut clearly and completely
+
+ 
+
+- detach tabs from the parts
+- test to assemble tab with pocket
+
+ 
+
+- got to assemble perfect
+
+ 
+
+## Making something big
+
+→[Individual Assignment](https://fabacademy.org/2022/labs/kannai/students/yukiya-yamane/assignments/week08/)
+
+## What I learn in this week
+-> [Individual Assignment](https://fabacademy.org/2022/labs/kannai/students/yukiya-yamane/assignments/week08/)
diff --git a/docs/images/week07/assemble.gif b/docs/images/week07/assemble.gif
new file mode 100644
index 0000000000000000000000000000000000000000..27846734cbe697f75197a4f48a0e3135c8ab1de0
Binary files /dev/null and b/docs/images/week07/assemble.gif differ
diff --git a/docs/images/week07/assemble_test.jpg b/docs/images/week07/assemble_test.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d84f0eef099f9fd47bc570fd532937fee9d542be
Binary files /dev/null and b/docs/images/week07/assemble_test.jpg differ
diff --git a/docs/images/week07/cut2d_drilling.jpeg b/docs/images/week07/cut2d_drilling.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..a5a3c0b4df4582c1a1cddaa6f4492443d5502c7d
Binary files /dev/null and b/docs/images/week07/cut2d_drilling.jpeg differ
diff --git a/docs/images/week07/cut2d_path.jpeg b/docs/images/week07/cut2d_path.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..24fc893619a23515993c27ad09946933576db7aa
Binary files /dev/null and b/docs/images/week07/cut2d_path.jpeg differ
diff --git a/docs/images/week07/mach3.jpeg b/docs/images/week07/mach3.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..f1c472ada78f63d7a9dcd94816816acb13d6acf8
Binary files /dev/null and b/docs/images/week07/mach3.jpeg differ
diff --git a/docs/images/week07/materialsetup.png b/docs/images/week07/materialsetup.png
new file mode 100644
index 0000000000000000000000000000000000000000..993f5c8af90098eb71a82768e12e63b970e3e749
Binary files /dev/null and b/docs/images/week07/materialsetup.png differ
diff --git a/docs/images/week07/pocket.jpeg b/docs/images/week07/pocket.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..3d97bb74581d3c54233ba518153ad6c81d266246
Binary files /dev/null and b/docs/images/week07/pocket.jpeg differ
diff --git a/docs/images/week07/pocket_test.jpeg b/docs/images/week07/pocket_test.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..80ebb7ed3541d095d5a7c4c8ab733558146db3d9
Binary files /dev/null and b/docs/images/week07/pocket_test.jpeg differ
diff --git a/docs/images/week07/safe.png b/docs/images/week07/safe.png
new file mode 100644
index 0000000000000000000000000000000000000000..621b0f3ed510a3d99d8efcc5afcf68060efa101c
Binary files /dev/null and b/docs/images/week07/safe.png differ
diff --git a/docs/images/week07/screwing.jpg b/docs/images/week07/screwing.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4143b98055c13afb5b6189e94612d71224d6b83f
Binary files /dev/null and b/docs/images/week07/screwing.jpg differ
diff --git a/docs/images/week07/setting_excerpt.jpg b/docs/images/week07/setting_excerpt.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5127fa64080af8231fc3747baff615255984b15a
Binary files /dev/null and b/docs/images/week07/setting_excerpt.jpg differ
diff --git a/docs/images/week07/test.jpeg b/docs/images/week07/test.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..02149da0355f770bfd3876dd487e994e07eaa446
Binary files /dev/null and b/docs/images/week07/test.jpeg differ
diff --git a/docs/images/week07/test1.jpeg b/docs/images/week07/test1.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..0e80e16a735a0e0c7086de289c3778cc7118a20f
Binary files /dev/null and b/docs/images/week07/test1.jpeg differ
diff --git a/docs/images/week07/test2.jpeg b/docs/images/week07/test2.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..d8b536ecf8782d2e16afe62ea88226278faa5200
Binary files /dev/null and b/docs/images/week07/test2.jpeg differ
diff --git a/docs/images/week07/test_scaling.jpg b/docs/images/week07/test_scaling.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..32152a5993c9a602491754d830fe4b4695b4413e
Binary files /dev/null and b/docs/images/week07/test_scaling.jpg differ
diff --git a/docs/images/week07/testfusion.png b/docs/images/week07/testfusion.png
new file mode 100644
index 0000000000000000000000000000000000000000..61d6bccf410cce21c5eb03ce128b0ded953ebb22
Binary files /dev/null and b/docs/images/week07/testfusion.png differ