Added "Up next" functionality.(I redistributed some method responsibilities in the process too)