Pushing changed to BasicCrawler so I can pull
Fixed merge conflict