Copied over additional components

Rewrote identifier lock