moving stuff around some more