Intermediate push of changes for moving to Scenery and Fort.