I am calling it a day. I'll test this again tomorrow and after some clean-up ...

I am calling it a day. I'll test this again tomorrow and after some clean-up and resolving review comments, if any, I will commit this. Thanks for all your help.