move stuff around OCD