Revert "Various updates - This version does NOT work"

This reverts commit dd3b21293bfc78c732b019994d3418f22b725f03.