Add MacroCommand and Hottub