Working on new API: almost there