WIP: fixing .vars loading issues