adding the auth packages
auth is working, thanks @pkarl
fixing merge errors in smart.lock
moving some stuff around