doing this again
Merge https://github.com/awlstar/fish