Trindaz: possibly? I just decided there was no good reason to do the thing that you were doing and rewrote it all