cleanup.
enhanced build_query to call encoders.
Changed password_encoder.