[Issue#208][WIP] Salma almost finished API