Did exercises up to make-it-modular