Integrated comments JSI

As I said last time, I've no clue whether this will work out-of-the-box or not... :wink: