Key and locks are now working
merge