last commit was a mistake, creating new bugs.  Fixed it and made the changes to correct the issue it was trying to solve