Mixed merge issue.  Starting to work on getting a good build.