Removing eval in favor of vm and fixing a left over underscore reference