More moving of things. Gotta get this right again.