Fishlab class, adjustments to final project