Integrate Lukas's code into the scaffolding. Again.