Initial changes for OFund app