#603

Here's a pull request with the progress so far.
@vanstee this gives me the error, I work when a user uploads an image.