Address book work

Updates