merged fully with Shelby
finished updated fish story