half-tempted to make this public.. wdyt?