[WIP] Feature/api integration