Thirst logic mostly done