Wafels edits - ball to be passed

I tried to make sure each commit touches one file only.