Got local vars working again