Moved stuff around
And made it work with shuffle