Make all fn curried

We should be consistent throughout the project/