Added vals and vars. wip