Some more steps added.
Intermediate commit for Simone.