Added external result and some more media choices. Need to migrate