FridayJan3Attempt2Merge

We may be lost in Git hell. Hopefully we will be able to merge our modifications. I am fully aware that much of the code does not meet the coding standards. We just need to get the basic functionality up and going and then go back and clean things up. I'm still discovering deficiencies in my data structures.