Added some stuff from workshop2 to workshop3

As workshop 2 is too long and workshop3 is too short.