Updated variables, scaffolding, and grid