refactor to eveapi