WIP towards glorious introduction of local vars