Revert "Latest changes from Joe 12/1"

This reverts commit 4cfa2a86289dc4d1b125c8dfc1af926f015c83b3.
Revert "Revert "Latest changes from Joe 12/1""

This reverts commit 16774f1fb679a5116fc7fc3131422f729510b96e.
Revert "Revert "Revert "Latest changes from Joe 12/1"""

This reverts commit add07f034226de21761a741f6c927c3258ec9d97.