move stuff around a bit