Final commit on Mixpanel stuff