[akling]

I first spoke with Tobi about this in mid-May, so it's been in the works for a while longer. :)