Yea, that's an idea, this is a pretty horrendous bit of code to have to copy/paste :)

@eteq what do you think?