Add new comment

(Incidentally, I've got suggestions for how to split up your features too, to avoid fragmenting features too much.)