Revert "Working on some things but blew up too many other things.  Going to roll back."

This reverts commit dca2f0d064035b66c58be8c5c09db6075b772584.