I think this was one of those cases that I needed to sleep on it.  I got all that working, will push soon.