added napa, added fund functions