Partializing stuff

Updated with nina's latest pull request!