initial tests. move some stuff around.