I think I have everything fixed and re-coded properly after merging with the upstream repository.  Committing before testing as a marker.