Added passwords and hashing
Merged