Extensive debugging/exploratory commit for understanding 2.1 & revolts