Feature/api

Are we using this somewhere?