That's what I would do too. Get the taps in and work on the pump later.