Checking in my progress. Work on Generic Events and more Hub cleanup.