If the cap's not up yet, I'll see about making a CS for this!