Slight refactor, add url option