Moves everything again, removes token handling