move some more stuff