Intercom/lock

nice job @yields, lgtm!

cc @gjohnson