Funds/#24

Closes #24