Extension to Challenge #21

I'm extending this challenge by another two weeks (yes, I'm a masochist).

Any difficulties, let me know.