WIP saving work
Automatically update the contact's avatar
Cleanup