Major updates to key, minor updates to LockIt class