move stuff around - get stuff to work