Before starting to add song lengths
Fixed shuffle so it's not ugly code, cleanup