Feature/api

uncountable??