Adding criterium, marginalia & midje