re #1 now upload-avatar only does avatar uploading, however there's no disk write yet