byI almost have a cistern with a well set up. it's taken ages to get the rocks cleared out of it (had to also rush-order a bunch of wheelbarrows), but it's almost ready for filling.
got a bit of extra time pressure - some goblin snatchers came through and I locked them in the fortress while quickly sending an unarmed squad at them. the squad WILL be armed soon but I don't currently have the outfits and weapons they'll need. they won their fight against the snatchers but one got injured, so I need to get him water soon.