christophsturm: I'm trying to figure out a way to do this as an addition, not a patch