getting close to final api