Added framework for pulling in events from the organization and did some...

... code consolidation and renamed a few variables that are now private to the class rather than the methods.