move some things around, debugging hadding