moving stuff around part deux