I like that idea, I'll take a look when it's merged.