Replan workshop 2
Improve workshop plan
Add TODO