move some stuff around to where it makes more sense