added mediator/system class, scraper classes