Feature/api connection