Committing for now, but I think I'll actually take a totally different approach.  Need to chat with Pippin.