Merge sasha commits + add new functions to the API