move stuff around some more