added erb structure, implemented fish list, modified tests