This patch does what user would expect, but I am not sure if this isn't too ugly or even necessary.

Perhaps rather than just review this I may want you to also look at task and consider if this is even best way to do this.

Thanks.