Basic locking functionality
Merge our error fixes, (..) wins