Restructured code
Initial handling of tracks