Lots of changes.  Added setAnalyticsEnabled() method.