Continue work on locks / lock attachment