A system for at least partial closed-loop control of a medical condition is disclosed. The system includes at least one medical fluid pump. The medical fluid pump including a sensor for determining the volume of fluid pumped by the pump. Also, at least one continuous analyte monitor, and a controller. The controller is in communication with the medical fluid pump and the at least one continuous analyte monitor. The controller includes a processor. The processor includes instructions for delivery of medical fluid based at least on data received from the at least one continuous analyte monitor.