This will get better when MediaCrush's API improves?