More porting of NoaaScraper