edited fish program to use a custom struct (also a makefile)