Fully implement data restrictions for engagement

@norm
@pbadenski