updated with upstream changes
libfish compiles
first bare commit. won't build here