Added more stuff to do for Bass and Treble
WIP Before deletion