Moved  vars to their own file.