Now working from filename (-f) and URL (-u)