Updating to include labels
Initial password protection work using salts to hash passwords