TODO for @Juleship and @matteolever

Take one of those tasks whenever you have time, but first tell me
which one you are going to work on, plis.