Add tracking events to the form so we can improve user experience.
Remove old cruft
Deal with 502s
Update tracking code