move some stuff around and out