Analytics Second Try

Fixed analytics, hopefully.