Migrated gpx into own routine
Switched to tcx files, added heart rate