Feature/24 remote avatar

I want to rebase this instead of merging. Creating the pull request to make reading diff easier.