More work on getting download tracking working.