reviving the idea... kicking the tires.
Fixing merge issue