Commenting out broken logic on master until I get help from Brent