Refactor to make artists routable