"Both goalies want to come back, we know that," Waddell said. "Obviously, it depends what the contract terms are. We just want to make sure we do our due diligence, not only on our guys, but make sure we know what the options are. Those decisions are coming in the near future because free agency starts July 1, and we want to make sure we're ahead of that. In the next couple weeks, I think we will figure the whole goaltending thing out."