Bunch of general changes around track info, commit before modularizing and adding drop support
Modularization