Finishing changing all variable instances to array