moving stuff around, adding more pieces