Track 7 v003

Another draft of of Track 7. Almost complete barring a few changes later on.