Analytics FINAL Update #2

Something didn't get committed sigh.