added encryption and salt methods .. need to fix tests