[DONE] 'Locking' entities

Released today