Created Catch class for moving fish data. Other small updates