Initial tracklist support
Code clean 1
Code cleanup 2
Code cleanup 3