Added dual timer/song functionality