TAME & Make Water: Engineering Design Extensions