Started on support for vars