Finish the players, branch for android, add search criteria