Changed Model, added password field, added validation/encription,
progress on service migration