Start work on replacing local vars