More currying instead of tuples for fund params. Split code into separate files.