adding pending stuff and adding password encryption