Adjusting back into the original lengthy version of IrrigationController; for testing...