adding start/stop timings. changing a few settings
poorly merging files (or maybe doing it awesomely)