Clean up.
Refactor: Class renaming
Fix: Get rid of duplicate ids+uids
Implement: lock, unlock, drop