add and move stuff around