Adding fish support
Going fishy