In progress of moving advertising into the router class