beginning work on deep fish
fixed merge