Move things around, still messy