Changes after januar workshop.
Homework in progress