Started adding more permissions checks for media