Fund updates

I think this does it for making everything work with the new models -- all tests pass and paging through, I don't see any problems.

Next up, delete the old models and finally, rename fund?