Cleaned up fish code; beginning data fetching