Refactored world tracking, added reservoir/water gathering