3.1 turn in - also added password salting