Customer context revision - broken at this point - DO NOT merge