added user/group model, controller