Move some things around