make-it-modular done