MORE CHANGES NEEDED!

Unique_locks derped out, need to fix.