RLK

James, I am not ready to merge yet, I just want to get the pull request in order so I can knock out all of the conflicts.  I'll let you know when I'm ready.