Bug fixes
Full Lockbox implementation