Fix #10 Fix #17 - Add toggles to enable and disable operations