move some stuff around
move a few things