We rolled back a lot of shit

Due to everything being bork we rolled back a lot of stuff. This commit
is to re-add rockstation and to make note of what happened.