CHG: Move lock creation into Locksmith