Ok, you guys are going more complex than I have time for at the moment.  I'll swing back to the PR when I have more time