find/add partially implemented