[Close #53, #54, #55, #56, # 57] Add tracks