more wip: changing vars to vals
wip