Lots of changes trying to get analytics to work