Testing
Finishing on the locking mechanism
Fixed lock conflicts