Rebased message lockdown model

For you @bmsauer