CFY-959 move some things around