Move some things around, prepare for level saving