job #2 - Introducing some structure