[WIP] Picture upload

WIP pull request, not to be merged to master just yet.