refactored fisheries and add some waters stuff
some updates
Merge pull request #7 from cookiescrumbs/refactored_fisheries

Refactored fisheries