Rewrote HTML Wrapper

Made a fetcher for each data source
And a listener for each data type