Refactored away the add model.

Started change password functionality.